_config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
_config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
_config->CndSet("Dir::Bin::lz4", "/usr/bin/lz4");
- if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
- _config->Set("Dir::Bin::lzma", _config->FindFile("Dir::Bin::xz"));
+ if (FileExists(_config->Find("Dir::Bin::xz")) == true) {
+ _config->Set("Dir::Bin::lzma", _config->Find("Dir::Bin::xz"));
_config->Set("APT::Compressor::lzma::Binary", "xz");
if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
_config->Set("APT::Compressor::lzma::CompressArg::", "--format=lzma");
// add the special "uncompressed" type
if (std::find(types.begin(), types.end(), "uncompressed") == types.end())
{
- std::string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
+ std::string const uncompr = _config->Find("Dir::Bin::uncompressed", "");
if (uncompr.empty() == true || FileExists(uncompr) == true)
types.push_back("uncompressed");
}
setDefaultConfigurationForCompressors();
compressors.push_back(Compressor(".", "", "", NULL, NULL, 0));
- if (_config->Exists("Dir::Bin::lz4") == false || FileExists(_config->FindFile("Dir::Bin::lz4")) == true)
+ if (_config->Exists("Dir::Bin::lz4") == false || FileExists(_config->Find("Dir::Bin::lz4")) == true)
compressors.push_back(Compressor("lz4",".lz4","lz4","-1","-d",50));
#ifdef HAVE_LZ4
else
compressors.push_back(Compressor("lz4",".lz4","false", NULL, NULL, 50));
#endif
- if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
+ if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->Find("Dir::Bin::gzip")) == true)
compressors.push_back(Compressor("gzip",".gz","gzip","-6n","-d",100));
#ifdef HAVE_ZLIB
else
compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 100));
#endif
- if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
+ if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->Find("Dir::Bin::xz")) == true)
compressors.push_back(Compressor("xz",".xz","xz","-6","-d",200));
#ifdef HAVE_LZMA
else
compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 200));
#endif
- if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
+ if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->Find("Dir::Bin::bzip2")) == true)
compressors.push_back(Compressor("bzip2",".bz2","bzip2","-6","-d",300));
#ifdef HAVE_BZ2
else
compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 300));
#endif
- if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
+ if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->Find("Dir::Bin::lzma")) == true)
compressors.push_back(Compressor("lzma",".lzma","lzma","-6","-d",400));
#ifdef HAVE_LZMA
else
int const &statusfd, int fd[2], std::string const &key)
{
#define EINTERNAL 111
- std::string const aptkey = _config->FindFile("Dir::Bin::apt-key", "/usr/bin/apt-key");
+ std::string const aptkey = _config->Find("Dir::Bin::apt-key", "/usr/bin/apt-key");
bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
if(Popen(&Args[0], PipeFd, Child, FileFd::ReadOnly) == false)
return _error->Error("ProxyAutoDetect command '%s' failed!", AutoDetectProxyCmd.c_str());
char buf[512];
- if (PipeFd.ReadLine(buf, sizeof(buf)) == nullptr)
- return _error->Error("Failed to read in AutoDetectProxy");
+ bool const goodread = PipeFd.ReadLine(buf, sizeof(buf)) != nullptr;
PipeFd.Close();
- ExecWait(Child, "ProxyAutoDetect", true);
+ if (ExecWait(Child, "ProxyAutoDetect") == false)
+ return false;
+ // no output means the detector has no idea which proxy to use
+ // and apt will use the generic proxy settings
+ if (goodread == false)
+ return true;
auto const cleanedbuf = _strstrip(buf);
-
+ // We warn about this as the implementor probably meant to use DIRECT instead
if (cleanedbuf[0] == '\0')
- return _error->Warning("ProxyAutoDetect returned no data");
+ {
+ _error->Warning("ProxyAutoDetect command returned an empty line");
+ return true;
+ }
if (Debug)
std::clog << "auto detect command returned: '" << cleanedbuf << "'" << std::endl;
- if (strstr(cleanedbuf, URL.Access.c_str()) == cleanedbuf)
+ if (strstr(cleanedbuf, URL.Access.c_str()) == cleanedbuf || strcmp(cleanedbuf, "DIRECT") == 0)
_config->Set("Acquire::"+URL.Access+"::proxy::"+URL.Host, cleanedbuf);
return true;
// ---------------------------------------------------------------------
/* This was lifted from the boa webserver which lifted it from 'wn-v1.07'
Made it a bit more robust with a few tolower_ascii though. */
-static int MonthConv(char *Month)
+static int MonthConv(char const * const Month)
{
switch (tolower_ascii(*Month))
{
method used to ignore the timezone and assume always UTC. */
bool RFC1123StrToTime(const char* const str,time_t &time)
{
- struct tm t;
- auto const &posix = std::locale("C.UTF-8");
- auto const parse_time = [&](char const * const s, bool const has_timezone) {
- std::istringstream ss(str);
- ss.imbue(posix);
- ss >> std::get_time(&t, s);
- if (has_timezone && ss.fail() == false)
- {
- std::string timezone;
- ss >> timezone;
- if (timezone.empty())
+ unsigned short day = 0;
+ signed int year = 0; // yes, Y23K problem – we gonna worry then…
+ std::string weekday, month, datespec, timespec, zone;
+ std::istringstream ss(str);
+ ss >> weekday;
+ // we only superficially check weekday, mostly to avoid accepting localized
+ // weekdays here and take only its length to decide which datetime format we
+ // encounter here. The date isn't stored.
+ std::transform(weekday.begin(), weekday.end(), weekday.begin(), ::tolower);
+ std::array<char const * const, 7> c_weekdays = {{ "sun", "mon", "tue", "wed", "thu", "fri", "sat" }};
+ if (std::find(c_weekdays.begin(), c_weekdays.end(), weekday.substr(0,3)) == c_weekdays.end())
+ return false;
+
+ switch (weekday.length())
+ {
+ case 4:
+ // Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123
+ if (weekday[3] != ',')
+ return false;
+ ss >> day >> month >> year >> timespec >> zone;
+ break;
+ case 3:
+ // Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format
+ ss >> month >> day >> timespec >> year;
+ zone = "UTC";
+ break;
+ case 0:
+ case 1:
+ case 2:
+ return false;
+ default:
+ // Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
+ if (weekday[weekday.length() - 1] != ',')
+ return false;
+ ss >> datespec >> timespec >> zone;
+ auto const expldate = VectorizeString(datespec, '-');
+ if (expldate.size() != 3)
+ return false;
+ try {
+ size_t pos;
+ day = std::stoi(expldate[0], &pos);
+ if (pos != expldate[0].length())
return false;
- if (timezone != "GMT" && timezone != "UTC" && timezone != "Z") // RFC 822
- {
- // numeric timezones as a should of RFC 1123 and generally preferred
- try {
- size_t pos;
- auto const zone = std::stoi(timezone, &pos);
- if (zone != 0 || pos != timezone.length())
- return false;
- } catch (...) {
- return false;
- }
- }
+ year = 1900 + std::stoi(expldate[2], &pos);
+ if (pos != expldate[2].length())
+ return false;
+ strprintf(datespec, "%.4d-%.2d-%.2d", year, MonthConv(expldate[1].c_str()) + 1, day);
+ } catch (...) {
+ return false;
}
- t.tm_isdst = 0;
- return ss.fail() == false;
- };
+ break;
+ }
- bool const good =
- // Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123
- parse_time("%a, %d %b %Y %H:%M:%S", true) ||
- // Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
- parse_time("%A, %d-%b-%y %H:%M:%S", true) ||
- // Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format
- parse_time("%c", false); // "%a %b %d %H:%M:%S %Y"
- if (good == false)
+ if (ss.fail() || ss.bad() || !ss.eof())
return false;
- time = timegm(&t);
+ if (zone != "GMT" && zone != "UTC" && zone != "Z") // RFC 822
+ {
+ // numeric timezones as a should of RFC 1123 and generally preferred
+ try {
+ size_t pos;
+ auto const z = std::stoi(zone, &pos);
+ if (z != 0 || pos != zone.length())
+ return false;
+ } catch (...) {
+ return false;
+ }
+ }
+
+ if (datespec.empty())
+ {
+ if (month.empty())
+ return false;
+ strprintf(datespec, "%.4d-%.2d-%.2d", year, MonthConv(month.c_str()) + 1, day);
+ }
+
+ std::string const datetime = datespec + ' ' + timespec;
+ struct tm Tm;
+ if (strptime(datetime.c_str(), "%Y-%m-%d %H:%M:%S", &Tm) == nullptr)
+ return false;
+ time = timegm(&Tm);
return true;
}
/*}}}*/
return _config->FindDir("Dir::State::lists") +
URItoFileName(MetaIndexURI(Type));
}
-
-std::string debReleaseIndex::MetaIndexURI(const char *Type) const
+static std::string constructMetaIndexURI(std::string URI, std::string const &Dist, char const * const Type)
{
- std::string Res;
-
if (Dist == "/")
- Res = URI;
+ ;
else if (Dist[Dist.size()-1] == '/')
- Res = URI + Dist;
+ URI += Dist;
else
- Res = URI + "dists/" + Dist + "/";
-
- Res += Type;
- return Res;
+ URI += "dists/" + Dist + "/";
+ return URI + Type;
+}
+std::string debReleaseIndex::MetaIndexURI(const char *Type) const
+{
+ return constructMetaIndexURI(URI, Dist, Type);
}
/*}}}*/
// ReleaseIndex Con- and Destructors /*{{{*/
std::string const &Dist, std::string const &Section,
bool const &IsSrc, std::map<std::string, std::string> const &Options) const
{
- debReleaseIndex *Deb = NULL;
- for (std::vector<metaIndex *>::const_iterator I = List.begin();
- I != List.end(); ++I)
+ debReleaseIndex * Deb = nullptr;
+ std::string const FileName = URItoFileName(constructMetaIndexURI(URI, Dist, "Release"));
+ for (auto const &I: List)
{
// We only worry about debian entries here
- if (strcmp((*I)->GetType(), "deb") != 0)
+ if (strcmp(I->GetType(), "deb") != 0)
+ continue;
+
+ auto const D = dynamic_cast<debReleaseIndex*>(I);
+ if (unlikely(D == nullptr))
continue;
- /* This check insures that there will be only one Release file
+ /* This check ensures that there will be only one Release file
queued for all the Packages files and Sources files it
corresponds to. */
- if ((*I)->GetURI() == URI && (*I)->GetDist() == Dist)
+ if (URItoFileName(D->MetaIndexURI("Release")) == FileName)
{
- Deb = dynamic_cast<debReleaseIndex*>(*I);
- if (Deb != NULL)
- break;
+ Deb = D;
+ break;
}
}
// No currently created Release file indexes this entry, so we create a new one.
- if (Deb == NULL)
+ if (Deb == nullptr)
{
Deb = new debReleaseIndex(URI, Dist);
List.push_back(Deb);
signed Score = 0;
if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
Score += 10;
- if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
+ if (FileExists(Cnf.Find("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
Score += 10;
if (FileExists("/etc/debian_version") == true)
Score += 10;
if (CmdL.FileSize() != 2)
return _error->Error(_("Need one URL as argument"));
URI ServerURL(CmdL.FileList[1]);
- AutoDetectProxy(ServerURL);
+ if (AutoDetectProxy(ServerURL) == false)
+ return false;
std::string SpecificProxy = _config->Find("Acquire::"+ServerURL.Access+"::Proxy::" + ServerURL.Host);
ioprintf(std::cout, "Using proxy '%s' for URL '%s'\n",
SpecificProxy.c_str(), std::string(ServerURL).c_str());
}
command_available() {
+ if [ -x "$1" ]; then return 0; fi
# command -v "$1" >/dev/null 2>&1 # not required by policy, see #747320
# which "$1" >/dev/null 2>&1 # is in debianutils (essential) but not on non-debian systems
local OLDIFS="$IFS"
only if the client uses a known identifier.</para>
<para><literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to
- specify an external command to discover the http proxy to use. Apt expects
- the command to output the proxy on stdout in the style
- <literal>http://proxy:port/</literal>. This will override the
- generic <literal>Acquire::http::Proxy</literal> but not any specific
- host proxy configuration set via
- <literal>Acquire::http::Proxy::$HOST</literal>.
+ specify an external command to discover the http proxy to use. The first
+ and only parameter is an URI denoting the host to be contacted to allow
+ for host-specific configuration. APT expects the command to output the
+ proxy on stdout as a single line in the style <literal>http://proxy:port/</literal>
+ or the word <literal>DIRECT</literal> if no proxy should be used. No output
+ indicates that the generic proxy settings should be used.
+
+ Note that auto-detection will not be used for a host if a host-specific proxy
+ configuration is already set via <literal>Acquire::http::Proxy::<replaceable>HOST</replaceable></literal>.
See the &squid-deb-proxy-client; package for an example implementation that
- uses avahi. This option takes precedence over the legacy option name
+ uses avahi.
+
+ This option takes precedence over the legacy option name
<literal>ProxyAutoDetect</literal>.
</para>
{
/* Closes encoding is used when the server did not specify a size, the
loss of the connection means we are done */
- if (Persistent == false)
- In.Limit(-1);
- else if (JunkSize != 0)
+ if (JunkSize != 0)
In.Limit(JunkSize);
- else
+ else if (DownloadSize != 0)
In.Limit(DownloadSize);
+ else if (Persistent == false)
+ In.Limit(-1);
// Just transfer the whole block.
do
# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
# Bjorn Steensrud <bjornst@powertech.no>, 2004.
# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.
+# Petter Reinholdtsen <pere@hungry.com>, 2016.
msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-06-11 17:24+0200\n"
-"PO-Revision-Date: 2010-09-01 21:10+0200\n"
-"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"POT-Creation-Date: 2016-06-13 11:54+0200\n"
+"PO-Revision-Date: 2016-06-11 22:38+0200\n"
+"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
+"Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Lokalize 1.5\n"
#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
#: apt-private/acqprogress.cc
#: apt-private/private-cacheset.cc apt-private/private-search.cc
msgid "Sorting"
-msgstr ""
+msgstr "Sorterer"
#: apt-private/private-cacheset.cc
#, c-format
msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
#: apt-private/private-cacheset.cc
-#, fuzzy
msgid " [Installed]"
msgstr " [Installert]"
#. TRANSLATORS: Note, this is not an interactive question
#: apt-private/private-cacheset.cc apt-private/private-install.cc
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+msgstr ""
+"Pakken '%s' er ikke installert, og derfor heller ikke fjernet. Mente du "
+"'%s'?\n"
#: apt-private/private-cacheset.cc apt-private/private-install.cc
#, fuzzy, c-format
#: apt-private/private-cmndline.cc
msgid "Most used commands:"
-msgstr ""
+msgstr "Mest brukte kommandoer:"
#: apt-private/private-cmndline.cc
#, c-format
msgid "See %s for more information about the available commands."
-msgstr ""
+msgstr "Se %s for mer informasjon om de tilgjengelige kommandoene."
#: apt-private/private-cmndline.cc
msgid ""
"Package and version choices can be expressed via apt_preferences(5).\n"
"Security details are available in apt-secure(8).\n"
msgstr ""
+"Detaljer om oppsettvalg og syntaks finnes i apt.conf(5).\n"
+"Informasjon om hvordan en setter opp kilder finnes i sources.list(5).\n"
+"Sikkerhetsdetaljer er tilgjengelig i apt-secure(8).\n"
#: apt-private/private-cmndline.cc
msgid "This APT has Super Cow Powers."
"--force-yes is deprecated, use one of the options starting with --allow "
"instead."
msgstr ""
+"--force-yes er utdatert, bruk en av valgene som starter med --allow istedet."
#: apt-private/private-download.cc
#, fuzzy
"Held packages were changed and -y was used without --allow-change-held-"
"packages."
msgstr ""
+"Pakker som er holdt igjen ble endret og -y ble brukt uten --allow-change-"
+"held-packages."
#: apt-private/private-install.cc
msgid "Internal error, Ordering didn't finish"
#, fuzzy, c-format
msgid "Use '%s' to remove it."
msgid_plural "Use '%s' to remove them."
-msgstr[0] "Bruk «%s» for å fjerne dem."
+msgstr[0] "Bruk «%s» for å fjerne den."
msgstr[1] "Bruk «%s» for å fjerne dem."
#: apt-private/private-install.cc
"angi en løsning)."
#: apt-private/private-install.cc
-#, fuzzy
msgid "The following additional packages will be installed:"
-msgstr "Følgende ekstra pakker vil bli installert."
+msgstr "Følgende ekstra pakker vil bli installert:"
#: apt-private/private-install.cc
msgid "Suggested packages:"
#: apt-private/private-list.cc
msgid "Listing"
-msgstr ""
+msgstr "Lister opp"
#: apt-private/private-list.cc
#, c-format
msgid_plural ""
"There are %i additional versions. Please use the '-a' switch to see them."
msgstr[0] ""
+"Det er %i ekstra versjon. Vær så snill å bruk '-a'-bryteren for å se den"
msgstr[1] ""
+"Det er %i ekstra versjoner. Vær så snill å bruk '-a'-bryteren for å se dem."
#: apt-private/private-main.cc
msgid ""
#: apt-private/private-output.cc apt-private/private-show.cc
msgid "unknown"
-msgstr ""
+msgstr "ukjent"
#: apt-private/private-output.cc
#, fuzzy, c-format
#: apt-private/private-output.cc
msgid "[installed,auto-removable]"
-msgstr ""
+msgstr "[installert,auto-fjernbar]"
#: apt-private/private-output.cc
#, fuzzy
#: apt-private/private-output.cc
#, c-format
msgid "[upgradable from: %s]"
-msgstr ""
+msgstr "[oppgraderbar fra: %s]"
#: apt-private/private-output.cc
msgid "[residual-config]"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
#: apt-private/private-output.cc
msgid "N"
-msgstr ""
+msgstr "N"
#: apt-private/private-output.cc apt-pkg/cachefilter.cc
#, c-format
#: apt-private/private-search.cc
msgid "Full Text Search"
-msgstr ""
+msgstr "Fulltekstsøk"
#: apt-private/private-show.cc cmdline/apt-cache.cc
#, c-format
msgid_plural ""
"There are %i additional records. Please use the '-a' switch to see them."
msgstr[0] ""
+"Det er %i ekstra oppføring. Vær så snill å bruk '-a'-bryteren for å se den"
msgstr[1] ""
+"Det er %i ekstra oppføringer. Vær så snill å bruk '-a'-bryteren for å se "
+"dem."
#: apt-private/private-show.cc
msgid "not a real package (virtual)"
-msgstr ""
+msgstr "ikke en virkelig pakke (virtuell)"
#: apt-private/private-show.cc apt-pkg/cacheset.cc
#, c-format
#: apt-private/private-show.cc
#, c-format
msgid "%s -> %s with priority %d\n"
-msgstr ""
+msgstr "%s -> %s med prioritet %d\n"
#: apt-private/private-show.cc
msgid " Installed: "
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"Ingen arkitekturinformasjon tilgjengelig for %s. Se apt.conf(5) APT::"
+"Architectures for oppsett."
#: apt-private/private-source.cc
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
+msgstr "Merk, bruker '%s'-katalogen for å få tak i byggavhengigheter\n"
#: apt-private/private-source.cc
#, fuzzy, c-format
#: apt-private/private-sources.cc
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "'%s'-filen din ble endret, vær så snill å kjør 'apt-get update'."
#: apt-private/private-unmet.cc
#, c-format
msgid_plural ""
"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
msgstr[0] ""
+"%i pakke kan oppgraderes. Kjør 'apt list --upgradable' for å se den.\n"
msgstr[1] ""
+"%i pakker kan oppgraderes. Kjør 'apt list --upgradable' for å se dem.\n"
#: apt-private/private-update.cc
msgid "All packages are up to date."
-msgstr ""
+msgstr "Alle pakkene er oppdatert."
#: cmdline/apt-cache.cc
#, fuzzy
#: cmdline/apt-cache.cc
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
+"Denne kommandoen er utdatert. Vær så snill å bruke 'apt-mark showauto' "
+"istedet."
#: cmdline/apt-cache.cc
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Denne kommandoen er utdatert. Vær så snill å bruk 'apt-mark auto' og 'apt-"
+"mark manual' istedet."
#: cmdline/apt-get.cc
msgid "Internal error, problem resolver broke stuff"
#: cmdline/apt-get.cc
msgid "Download the binary package into the current directory"
-msgstr ""
+msgstr "Last ned binærpakke til gjeldende katalog"
#: cmdline/apt-get.cc
msgid "Download and display the changelog for the given package"
-msgstr ""
+msgstr "Last ned og vis endringsloggen for den oppgitte pakken"
#: cmdline/apt-helper.cc
msgid "Need one URL as argument"
-msgstr ""
+msgstr "Trenger en URL som argument"
#: cmdline/apt-helper.cc
#, fuzzy
#: cmdline/apt-helper.cc
msgid "Download Failed"
-msgstr ""
+msgstr "Nedlasting feilet"
#: cmdline/apt-helper.cc
#, c-format
msgid "GetSrvRec failed for %s"
-msgstr ""
+msgstr "GetSrvRec feilet for %s"
#: cmdline/apt-helper.cc
msgid ""
#: cmdline/apt-helper.cc
msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
-msgstr ""
+msgstr "Slå opp en SRV-oppføring (f.eks. _http._tcp.ftp.debian.org)"
#: cmdline/apt-helper.cc
msgid "concatenate files, with automatic decompression"
-msgstr ""
+msgstr "slå sammen filer, med automatisk utpakking"
#: cmdline/apt-helper.cc
msgid "detect proxy using apt.conf"
#: cmdline/apt-mark.cc
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Klarte ikke kjøre dpkg. Er du root?"
#: cmdline/apt-mark.cc
#, fuzzy, c-format
#: cmdline/apt-mark.cc
#, c-format
msgid "Selected %s for removal.\n"
-msgstr ""
+msgstr "Valgte %s for fjerning.\n"
#: cmdline/apt-mark.cc
#, c-format
msgid "Selected %s for installation.\n"
-msgstr ""
+msgstr "Valgte %s for installering.\n"
#: cmdline/apt-mark.cc
msgid ""
#: cmdline/apt-mark.cc
msgid "Mark a package as held back"
-msgstr ""
+msgstr "Marker en pakke som holdt tilbake"
#: cmdline/apt-mark.cc
msgid "Unset a package set as held back"
-msgstr ""
+msgstr "Fjern markering som holdt tilbake for en pakke"
#: cmdline/apt-mark.cc
#, fuzzy
#: cmdline/apt-mark.cc
msgid "Print the list of package on hold"
-msgstr ""
+msgstr "Skriv listen med pakker som holdes tilbake"
#: cmdline/apt.cc
msgid ""
#. query
#: cmdline/apt.cc
msgid "list packages based on package names"
-msgstr ""
+msgstr "list pakker basert på pakkenavn"
#: cmdline/apt.cc
#, fuzzy
#: cmdline/apt.cc
msgid "show package details"
-msgstr ""
+msgstr "vis pakkedetaljer"
#. package stuff
#: cmdline/apt.cc
#: cmdline/apt.cc
msgid "upgrade the system by installing/upgrading packages"
-msgstr ""
+msgstr "oppgrader systemet ved å installere/oppgradere pakker"
#: cmdline/apt.cc
msgid "upgrade the system by removing/installing/upgrading packages"
-msgstr ""
+msgstr "oppgrader systemet ved å fjerne/installere/oppgradere pakker"
#. misc
#: cmdline/apt.cc
#: methods/gpgv.cc
#, c-format
msgid "Signature by key %s uses weak digest algorithm (%s)"
-msgstr ""
+msgstr "Signatur med nøkkel %s bruker svak oppsummeringsalgoritme (%s)"
#: methods/gpgv.cc
msgid "The following signatures were invalid:\n"
#: methods/store.cc
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Tomme filer kan ikke være gyldige arkiver"
#: dselect/install:33
msgid "Bad default setting!"
msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?"
-# Note to translators: The following four messages belong together. It doesn't\r
-# matter where sentences start, but it has to fit in just these four lines, and\r
-# at only 80 characters per line, if possible.\r
+# Note to translators: The following four messages belong together. It doesn't
+# matter where sentences start, but it has to fit in just these four lines, and
+# at only 80 characters per line, if possible.
#: dselect/install:102
msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr "Feil oppstod ved utpakkinga. Setter nå opp de installerte pakkene."
#: apt-pkg/contrib/fileutl.cc
msgid "Unexpected end of file"
-msgstr ""
+msgstr "Uventet slutt på fil"
#: apt-pkg/contrib/fileutl.cc
msgid "Failed to create subprocess IPC"
msgstr "Kan ikke utføre mmap på en tom fil"
#: apt-pkg/contrib/mmap.cc
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr "Klarte ikke lage mmap av %lu bytes"
+msgstr "Klarte ikke lage mmap av %llu bytes"
#: apt-pkg/contrib/mmap.cc
#, c-format
#: apt-pkg/contrib/progress.cc
msgid "..."
-msgstr ""
+msgstr "..."
#. Print the spinner
#: apt-pkg/contrib/progress.cc
msgstr "Fjernet %s fullstendig"
#: apt-pkg/deb/dpkgpm.cc
-#, fuzzy, c-format
+#, c-format
msgid "Can not write log (%s)"
-msgstr "Kan ikke skrive til %s"
+msgstr "Kan ikke skrive logg (%s)"
#: apt-pkg/deb/dpkgpm.cc
msgid "Is /dev/pts mounted?"
-msgstr ""
+msgstr "Er /dev/pts montert?"
#: apt-pkg/deb/dpkgpm.cc
msgid "Operation was interrupted before it could finish"
"minne»-feil"
#: apt-pkg/deb/dpkgpm.cc
-#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
-"feil"
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer et problem på det "
+"lokale systemet."
#: apt-pkg/deb/dpkgpm.cc
msgid ""
#: apt-pkg/tagfile.cc
#, c-format
msgid "Cannot convert %s to integer: out of range"
-msgstr ""
+msgstr "Kan ikke gjøre om %s til heltall: utenfor rekkevidde"
#: apt-pkg/update.cc
#, fuzzy
msgid "Calculating upgrade"
msgstr "Beregner oppgradering"
+#~ msgid "Failed to fetch %s %s\n"
+#~ msgstr "Klarte ikke å skaffe %s %s\n"
+
#~ msgid "(not found)"
#~ msgstr "(ikke funnet)"
#~ msgid " Package pin: "
#~ msgstr " Pakke låst til: "
+#~ msgid "Invalid 'Valid-Until' entry in Release file %s"
+#~ msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
+
#~ msgid "There is no public key available for the following key IDs:\n"
#~ msgstr ""
#~ "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-"
testfileequal './downloaded/foo10' 'bar'
}
+setupproxydetect() {
+ local METH="$1"
+ shift
+ {
+ echo '#!/bin/sh -e'
+ echo "$@"
+ } > "${TMPWORKINGDIRECTORY}/apt-proxy-detect"
+ chmod 755 "${TMPWORKINGDIRECTORY}/apt-proxy-detect"
+ echo "Acquire::${METH}::Proxy-Auto-Detect \"${TMPWORKINGDIRECTORY}/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
+}
+
test_apt_helper_detect_proxy() {
- # no proxy
+ msgmsg 'apt-helper auto-detect-proxy' 'no proxy'
testsuccessequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
-
-
- # http auto detect proxy script
- cat > apt-proxy-detect <<'EOF'
-#!/bin/sh -e
-echo "http://some-proxy"
-EOF
- chmod 755 apt-proxy-detect
- echo "Acquire::http::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
-
+ setupproxydetect 'http' 'exit 0'
+ testsuccessequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
+ setupproxydetect 'http' 'exit 1'
+ testfailureequal 'E: Sub-process ProxyAutoDetect returned an error code (1)' apthelper auto-detect-proxy http://example.com/
+ setupproxydetect 'http' 'echo'
+ testwarningequal "Using proxy '' for URL 'http://example.com/'
+W: ProxyAutoDetect command returned an empty line" apthelper auto-detect-proxy http://example.com/
+ setupproxydetect 'http' 'echo DIRECT'
+ testsuccessequal "Using proxy 'DIRECT' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
+
+ msgmsg 'apt-helper auto-detect-proxy' 'http proxy'
+ setupproxydetect 'http' 'echo "http://some-proxy"'
testsuccessequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
-
- # https auto detect proxy script
- cat > apt-proxy-detect <<'EOF'
-#!/bin/sh -e
-echo "https://https-proxy"
-EOF
- chmod 755 apt-proxy-detect
- echo "Acquire::https::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
-
+ msgmsg 'apt-helper auto-detect-proxy' 'https proxy'
+ setupproxydetect 'https' 'echo "https://https-proxy"'
testsuccessequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com
}
test_apt_helper_download "http://localhost:${APTHTTPPORT}"
test_apt_helper_download "https://localhost:${APTHTTPSPORT}"
test_apt_helper_detect_proxy
-
-# test failure modes
+msgmsg 'test various failure modes'
testfailureequal 'E: Invalid operation download' apthelper download
testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file
testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file 'http://example.org/'
--- /dev/null
+#!/bin/sh
+set -e
+
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
+setupenvironment
+configarchitecture 'amd64'
+
+insertpackage 'stable' 'foo' 'all' '1'
+insertsource 'stable' 'foo' 'all' '1'
+setupaptarchive --no-update
+
+# install a slowed down file: otherwise its to fast to reproduce combining
+NEWMETHODS="$(readlink -f rootdir)/usr/lib/apt/methods"
+OLDMETHODS="$(readlink -f rootdir/usr/lib/apt/methods)"
+rm "$NEWMETHODS"
+mkdir "$NEWMETHODS"
+backupIFS="$IFS"
+IFS="$(printf "\n\b")"
+for METH in $(find "$OLDMETHODS" ! -type d); do
+ ln -s "$OLDMETHODS/$(basename "$METH")" "$NEWMETHODS"
+done
+IFS="$backupIFS"
+ln -s "${OLDMETHODS}/http" "${NEWMETHODS}/http-ng"
+
+changetowebserver
+sed -i -e 's# http:# http-ng:#' $(find rootdir/etc/apt/sources.list.d -name '*-deb-src.list')
+
+testsuccess apt update
+cp rootdir/tmp/testsuccess.output update.log
+# all requests are folded into the first Release file
+testsuccess grep ' http-ng://' update.log
+testfailure grep ' http://' update.log
time_t t;
EXPECT_TRUE(RFC1123StrToTime("Sun, 06 Nov 1994 08:49:37 GMT", t));
EXPECT_EQ(784111777, t);
+ } {
+ time_t t;
+ EXPECT_TRUE(RFC1123StrToTime("Sun, 6 Nov 1994 08:49:37 UTC", t));
+ EXPECT_EQ(784111777, t);
+ } {
+ time_t t;
+ EXPECT_TRUE(RFC1123StrToTime("Sun, 6 Nov 1994 08:49:37 UTC", t));
+ EXPECT_EQ(784111777, t);
+ } {
+ time_t t;
+ EXPECT_TRUE(RFC1123StrToTime("Sun, 06 Nov 1994 8:49:37 UTC", t));
+ EXPECT_EQ(784111777, t);
} {
time_t t;
EXPECT_TRUE(RFC1123StrToTime("Sun, 06 Nov 1994 08:49:37 UTC", t));
time_t t;
EXPECT_TRUE(RFC1123StrToTime("Sunday, 06-Nov-94 08:49:37 GMT", t));
EXPECT_EQ(784111777, t);
+ } {
+ time_t t;
+ EXPECT_TRUE(RFC1123StrToTime("Sunday, 6-Nov-94 08:49:37 GMT", t));
+ EXPECT_EQ(784111777, t);
+ } {
+ time_t t;
+ EXPECT_TRUE(RFC1123StrToTime("Sunday, 06-Nov-94 8:49:37 GMT", t));
+ EXPECT_EQ(784111777, t);
} {
time_t t;
EXPECT_TRUE(RFC1123StrToTime("Sun Nov 6 08:49:37 1994", t));
EXPECT_EQ(784111777, t);
+ } {
+ time_t t;
+ EXPECT_TRUE(RFC1123StrToTime("Sun Nov 06 08:49:37 1994", t));
+ EXPECT_EQ(784111777, t);
+ } {
+ time_t t;
+ EXPECT_TRUE(RFC1123StrToTime("Sun Nov 6 8:49:37 1994", t));
+ EXPECT_EQ(784111777, t);
}
time_t t;
+ EXPECT_FALSE(RFC1123StrToTime("So, 06 Nov 1994 08:49:37 UTC", t));
+ EXPECT_FALSE(RFC1123StrToTime(", 06 Nov 1994 08:49:37 UTC", t));
+ EXPECT_FALSE(RFC1123StrToTime("Son, 06 Nov 1994 08:49:37 UTC", t));
+ EXPECT_FALSE(RFC1123StrToTime("Sun: 06 Nov 1994 08:49:37 UTC", t));
EXPECT_FALSE(RFC1123StrToTime("Sun, 06 Nov 1994 08:49:37", t));
+ EXPECT_FALSE(RFC1123StrToTime("Sun, 06 Nov 1994 08:49:37 GMT+1", t));
EXPECT_FALSE(RFC1123StrToTime("Sun, 06 Nov 1994 GMT", t));
+ EXPECT_FALSE(RFC1123StrToTime("Sunday, 06 Nov 1994 GMT", t));
EXPECT_FALSE(RFC1123StrToTime("Sonntag, 06 Nov 1994 08:49:37 GMT", t));
EXPECT_FALSE(RFC1123StrToTime("domingo Nov 6 08:49:37 1994", t));
+ EXPECT_FALSE(RFC1123StrToTime("Sunday: 06-Nov-94 08:49:37 GMT", t));
EXPECT_FALSE(RFC1123StrToTime("Sunday, 06-Nov-94 08:49:37 GMT+1", t));
EXPECT_FALSE(RFC1123StrToTime("Sunday, 06-Nov-94 08:49:37 EDT", t));
EXPECT_FALSE(RFC1123StrToTime("Sunday, 06-Nov-94 08:49:37 -0100", t));
projects / apt.git / commitdiff
