Imported Upstream version 1.12.34

Change-Id: I5dbc2a879da6eb2f67f9995f987b62b8034bb95f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 8f48873..f5188db 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "33")
+SET(VERSION_PATCH "34")
 
-# LAST RELEASED: 1.12.33
+# LAST RELEASED: 1.12.34
 #=======

diff --git a/doc/zypper.8 b/doc/zypper.8
index d4b39b0..c6a0943 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -2,12 +2,12 @@
 .\"     Title: zypper
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/07/2016
+.\"      Date: 02/24/2016
 .\"    Manual: ZYPPER
 .\"    Source: SUSE Linux
 .\"  Language: English
 .\"
-.TH "ZYPPER" "8" "01/07/2016" "SUSE Linux" "ZYPPER"
+.TH "ZYPPER" "8" "02/24/2016" "SUSE Linux" "ZYPPER"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -153,7 +153,7 @@ File conflicts happen when two packages attempt to install files with the same n
 .sp
 As checking for file conflicts requires access to the full filelist of each package being installed, zypper will check for file conflict only if all packages are downloaded in advance (see \fB\-\-download\-in\-advance\fR)\&.
 .sp
-As the reason for file conflicts usually is a poor package design or lack of coordination between the the people building the packages, they are not easy to resolve\&. By using the \fB\-\-replacefiles\fR option you can force zypper to replace the conflicting files\&. Nevertheless this may damage the package whose file gets replaced\&.
+As the reason for file conflicts usually is a poor package design or lack of coordination between the people building the packages, they are not easy to resolve\&. By using the \fB\-\-replacefiles\fR option you can force zypper to replace the conflicting files\&. Nevertheless this may damage the package whose file gets replaced\&.
 .SH "COMMANDS"
 .sp
 zypper provides a number of \fIcommands\fR\&. Each command accepts the options listed in the \fBGLOBAL OPTIONS\fR section\&. These options must be specified \fIbefore\fR the command name\&. In addition, many commands have specific options, which are listed in this section\&. These command\-specific options must be specified \fIafter\fR the name of the command and \fIbefore\fR any of the command arguments\&.
@@ -2599,16 +2599,15 @@ Show the number of resolvables matched by each lock\&. This option requires load
 .RS 4
 List the resolvables matched by each lock\&. This option requires loading the repositories\&.
 .RE
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-Add a package lock\&. Specify packages to lock by exact name or by a glob pattern using *** and \*(Aq*?*\*(Aq wildcard characters\&.
-.fi
-.if n \{\
 .RE
-.\}
+.PP
+\fBaddlock\fR (\fBal\fR) [\fIoptions\fR] \fIpackage\-name\fR\&...
+.RS 4
+Add a package lock\&. Specify packages to lock by exact name or by a glob pattern using
+\fB*\fR
+and
+\fI\fB?\fR\fR
+wildcard characters\&.
 .PP
 \fB\-r\fR, \fB\-\-repo\fR \fIalias\fR|\fIname\fR|\fI#\fR|\fIURI\fR
 .RS 4
@@ -2848,7 +2847,7 @@ on the standard output, followed by a newline\&. Any
 \fB%s\fR
 directive in
 \fIformat\fR
-is replaced by the the system service name\&.
+is replaced by the system service name\&.
 .RE
 .PP
 Examples:
@@ -3348,7 +3347,7 @@ command)\&.
 .RE
 .SH "EXIT CODES"
 .sp
-There are several exit codes defined for zypper built\-in commands for use e\&.g\&. within scripts\&. These codes are defined in header file src/zypper\-main\&.h found in zypper source package\&. Codes from interval (1\-5) denote an error, numbers (100\-105) provide a specific information, 0 represents a normal successful run\&. Following is a list of these codes with descriptions:
+There are several exit codes defined for zypper built\-in commands for use e\&.g\&. within scripts\&. These codes are defined in header file src/zypper\-main\&.h found in zypper source package\&. Codes below 100 denote an error, codes above 100 provide a specific information, 0 represents a normal successful run\&. Following is a list of these codes with descriptions:
 .PP
 \fB0\fR \- \fBZYPPER_EXIT_OK\fR
 .RS 4
@@ -3433,6 +3432,12 @@ command in case any of the arguments does not match any of the available (or ins
 .RS 4
 Returned upon exiting after receiving a SIGINT or SIGTERM\&.
 .RE
+.PP
+\fB106\fR \- \fBZYPPER_EXIT_INF_REPOS_SKIPPED\fR
+.RS 4
+Some repository had to be disabled temporarily because it failed to refresh\&. You should check your repository configuration (e\&.g\&.
+\fBzypper ref \-f\fR)\&.
+.RE
 .sp
 Zypper subcommands (see section \fBSUBCOMMANDS\fR) may return \fBdifferent codes\fR which should be described in the commands man page\&. Call \fBzypper help \fR\fB\fIsubcommand\fR\fR to see the subcommands man page if one is provided\&.
 .SH "HOMEPAGE"

diff --git a/doc/zypper.8.txt b/doc/zypper.8.txt
index cb5a2e7..af630a6 100644 (file)
--- a/doc/zypper.8.txt
+++ b/doc/zypper.8.txt
@@ -1341,6 +1341,7 @@ Package locks serve the purpose of preventing changes to the set of installed pa
                 List the resolvables matched by each lock. This option requires loading the repositories.
 --
 
+*addlock* (*al*) ['options'] 'package-name'...::
        Add a package lock. Specify packages to lock by exact name or by a glob pattern using *** and '*?*' wildcard characters.
 +
 --
@@ -1669,7 +1670,7 @@ FILES
 
 EXIT CODES
 ----------
-There are several exit codes defined for zypper built-in commands for use e.g. within scripts. These codes are defined in header file src/zypper-main.h found in zypper source package. Codes from interval (1-5) denote an error, numbers (100-105) provide a specific information, 0 represents a normal successful run. Following is a list of these codes with descriptions:
+There are several exit codes defined for zypper built-in commands for use e.g. within scripts. These codes are defined in header file src/zypper-main.h found in zypper source package. Codes below 100 denote an error, codes above 100 provide a specific information, 0 represents a normal successful run. Following is a list of these codes with descriptions:
 
 *0* - *ZYPPER_EXIT_OK*::
        Successful run of zypper with no special info.
@@ -1701,6 +1702,8 @@ There are several exit codes defined for zypper built-in commands for use e.g. w
        Returned by the *install* and the *remove* command in case any of the arguments does not match any of the available (or installed) package names or other capabilities.
 *105* - *ZYPPER_EXIT_ON_SIGNAL*::
        Returned upon exiting after receiving a SIGINT or SIGTERM.
+*106* - *ZYPPER_EXIT_INF_REPOS_SKIPPED*::
+       Some repository had to be disabled temporarily because it failed to refresh. You should check your repository configuration (e.g. *zypper ref -f*).
 
 Zypper subcommands (see section *SUBCOMMANDS*) may return *different codes* which should be described in the commands man page. Call *zypper help 'subcommand'* to see the subcommands man page if one is provided.
 

diff --git a/package/zypper.changes b/package/zypper.changes
index 347bef6..f5d36fe 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Wed Feb 24 15:22:53 CET 2016 - ma@suse.de
+
+- Return 106-ZYPPER_EXIT_INF_REPOS_SKIPPED if repos were skipped due
+  to a failing refresh (bsc#968006)
+- Fix repo import to honor enable and autorefresh flags (bsc#967673)
+- fix addlock man page header (boo#966760)
+- version 1.12.34
+
+-------------------------------------------------------------------
+Thu Feb 18 01:13:24 CET 2016 - ma@suse.de
+
+- Update zypper-po.tar.bz2
+
+-------------------------------------------------------------------
 Mon Feb 15 09:12:12 CET 2016 - ma@suse.de
 
 - products: fix wrong repository shown for installed products

diff --git a/po/zypper-po.tar.bz2 b/po/zypper-po.tar.bz2
index 4f93ff4..9a36e34 100644 (file)
Binary files a/po/zypper-po.tar.bz2 and b/po/zypper-po.tar.bz2 differ

diff --git a/src/main.h b/src/main.h
index 089a542..bfcda5a 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -23,7 +23,8 @@
 #define ZYPPER_EXIT_INF_REBOOT_NEEDED      102 // reboot needed after install/upgrade 
 #define ZYPPER_EXIT_INF_RESTART_NEEDED     103 // restart of package manager itself needed
 #define ZYPPER_EXIT_INF_CAP_NOT_FOUND      104 // given capability not found (for install/remove)
-#define ZYPPER_EXIT_ON_SIGNAL              105 // SIGINT or SIGTERM received
+#define ZYPPER_EXIT_ON_SIGNAL              105 // SIGINT or SIGTERM received   (HOW CAN THIS BE 'info'?)
+#define ZYPPER_EXIT_INF_REPOS_SKIPPED      106 // some repos have been skipped due to refresh errors
 
 // undefine _, N_ and PL_ macros from libzypp
 #ifdef _

diff --git a/src/repos.cc b/src/repos.cc
index e8420bc..71e47b6 100644 (file)
--- a/src/repos.cc
+++ b/src/repos.cc
@@ -852,7 +852,7 @@ void do_init_repos( Zypper & zypper, const Container & container )
     // errors may continue. For now at least remember the refresh error to prevent
     // a 0 exit code after the action completed. (bsc#961719, bsc#961724, et.al.)
     // zypper.setExitCode( ZYPPER_EXIT_ERR_ZYPP );
-    zypper.setRefreshCode( ZYPPER_EXIT_ERR_ZYPP );
+    zypper.setRefreshCode( ZYPPER_EXIT_INF_REPOS_SKIPPED );
   }
 }
 
@@ -1781,15 +1781,12 @@ void add_repo_from_file( Zypper & zypper,
       continue;
     }
 
-    MIL << "requested: enabled: " << enabled << " autorefresh: " << autorefresh << endl;
     // enable by default
-    if ( indeterminate(enabled) )
-      enabled = true;
-    repo.setEnabled( (enabled == true) );
-    // disable autorefresh by default
-    if ( indeterminate(autorefresh) )
-      autorefresh = false;
-    repo.setAutorefresh( (autorefresh == true) );
+    if ( !indeterminate(enabled) )
+      repo.setEnabled( enabled );
+
+    if ( !indeterminate(autorefresh) )
+      repo.setAutorefresh( autorefresh );
 
     if ( !indeterminate(keepPackages) )
       repo.setKeepPackages( keepPackages );
@@ -1800,8 +1797,6 @@ void add_repo_from_file( Zypper & zypper,
     if ( prio >= 1 )
       repo.setPriority( prio );
 
-    MIL << "to-be-added: enabled: " << repo.enabled() << " autorefresh: " << repo.autorefresh() << endl;
-
     add_repo( zypper, repo );
   }
   return;